Move default handler to specific handler class