script support improvement