Improved NAS key-map