PDIO-186 Refactoring