Use isFinalState instead of individual states