Added more options when specifying date ranges