Added support for M117 parsing