Added basic state stack