Made key-mapping better