PDIO-145 Integration with new generalizations