Added changes in input string interpretation