Switch to new character state model