Add support for m7