Map added back in