Changing some serialization rules