Add missing using on context classes.
Move user provided handlers through the op context.