adding context objects back