Adding multi-handler-context functionality