Added remapping of keyboard