Updated Task manager