Added support for other handler types.