added contexts to type