New constants and singleton. See esp. StateSingleton.java and C.java