PersistanceFacade refactoring.