Added task management class