Feature/676 service path context types

Implements issue #676
Two spaces added at end-of-line.
The lint-tool complains about this ...