Changed Map class - no longer a Singleton (for unit testing purposes)