Improved task management