Completely revamped maps to use maps generated from map files