Introduced HandlerManager