Added state list. clean code