Adding Task model and more