Map refactored to new architecture.
	/me is happy!