Refactored for MapInitializer (1.5.4); Release 1.2