Added support for custom handlers that can replace / work side-by-side with existing handlers#309