Extract tasks, update plugin