Added support for date type