Script Handler updated