PDIO-278 Finish implementation