Add new concept of `base state`