PersistDefinitions refactoring
improve example