Updated FSM to match global constants.