Optional upgrade to modified keyholders