Simplify context logic