added Serialization to a couple of classes