Refactor the schema to include a collection for dates
refactor convention for dates