Added States Scaffold