Adjusted input regexps