Some changes for keymapping and Actions