Updated Map Data Structure (closes #8)