Modified so it still get the current line reference for the variable type