Add support to inject progress handler