Added support for progress measuring