New features and updates due to changes in ploy_*

This requires new versions which don't have releases yet.