added configurable context