Removed colon from map names
Added map lookup to import