Feature/676 service path context types

Implements issue #676
Fixed in 1673a86