Updated key mapping