Added state behavior