Added method for replacing common states