Add Task models. Remove UserType field as redundant