Updated task class with id and calendar for the dates