added service_codes and tracking_codes to the base