Refactor persistence.properties