Adding many changes to add all objects from API