Added map entities