refactored changing entity properties