Updated Key classes to include a second template argument.