Minor refactoring
Add multiline support