improve Task model

improve Task model