Added progressbar support in few places