Addition of the date range support