Introduce additional state for packrat stuff