Added some control mapping