Rework client to call prebuilt scripts