Modified Object controller to avoid hierarchical objects in properties