Making changes for the generic script