Preparation for HeroModelPersistence