Start making Map data more abstract.