improved variable and multiline support