Updated scripts to handle paths