Revert "Make properties private to prevent regeneration in entities"

This reverts commit b1b507cc1c8e49a606b95b29f4098a58a5b4b81f.