PDIO-236 refactoring valid attributes