Removed all references to core.map, replaced with triggers or other