Refactored objects to be associated with IDs