Refactored DatabasePersister