Some modifications to the Models to control how they are serialized to J...

...SON