Added from_date and to_date