Handle entity properties correctly