Script proxy handling added