COR-333: Re-add the todos related to dates