Fixed integration with pma-scripts