Make ObjectState more compatible with ObjectForm