Support for m7 and jf