Improve the long running operation