Added support for TARGET specification and DisablePayloadHandler option