Refactored model hydration to only affect public properties