Improvements to service interface.