added support for default handler