Context class added