PDI plugin enhancements