add switch and dueDate Model