Added a few additional keys to the map