Added raw support for contexts