Add support for M4