Added more key mappings