Separated task from plugin