Added default handler and with_params