Updates to serialization as part of the Subject refactor.