[fix] Fix mapping of entities