Added fixes for key mapping