Fixed extended entity properties persistence