Added support for date in models