Updated key mappings