More flexible helper scripts