Added command arguments and fixed shift key mapping