Added state_id