further work for map entities