Update: Add options for different states