Added chapter state system