Add support for handlers