More expansions to evaluateState functions