Added ServiceContext