Following #802. It also adds a simple __service type.
__service
This will create a new commit in order to revert the existing changes.
