Stubbed some of the changes to the serde