Removed TODO since progress handler is still is discussion by our comuunity