PLT-411 - Add service context

Fix from PR