Added support for non M7 devices