Internal refactor to expand objects from root