Re-added map.cpp