Add global handler in addition to supporting custom handlers