Refactor Objects to Object
Merge remote-tracking branch 'origin/feature/refactor_objects_to_object' into develop