Add support for m3s (Elite)