More work on Service.