Yet more document service work