PDIO-35 #comment Config refactorization