Added parameter passing to script locator