Changes to support serialization