Implementation fixes and multiline support