Add Context builder service