Updated helper scripts