Break out objects and add dependencies