added annotations to map entities