Add hack for handlers