Simplify and change context API, backward compat break