More doc

- Service class
- Wording change