Update application to utilize basic state class