More flexible state options