Modified the datatypes to use date objects