Adding support for prefixed commands and multiline comments