Simplify the context definition