Add support for specifying handlers