allow custom entity properties
merge