further simplify context objects