Removed ObjectWithId, added name fields