Keys map, controller refactor.