[0.2] Updated to use new map system.