Moved processing in tasks