Started work on map entities