Add arguments to external calls, add changeOptionByValue method