Added maps. Removed handled TODO (thanks MelvinK)