Use strict maps for state tracking