Added simple task management