Added a ServiceContext