Adding variable name lookup for WI