Improved tasks management