Refactoring persistence container client