Added service script, updated key mapping