Documentation and service layer additions