Added state stack