Simplifying TaskModel interfaces and adding comments