Consolidated some objects, added custom_fields handling