Removed legacy key support, added custom key support