Update service definitions, configuration and tests to extend delivery interface