Adding support for sorting by Date and Calendar values