Use new v2 storage models to serialize and deserialize everywhere

Use new v2 storage models to serialize and deserialize everywhere #264