Add service and additional fields