Adding context id to environment