Move data model persistence keys to DataModelPersister