Made the save-model-mixin more generic