Nested models refactor