Added optimization to only parse data within the date range