Added keymap and place holders