Changed as_of_date to Date