Change ContainerState object to be immutable, add two additional properties