Made changes to DateField to include option