Added support for Raven Handler