Better support for m2e