Using proper lookups for history files