Added Map functionality, fixed merge issues
Added Map functionality, fixed merge issues