Added a component key system