Added tested support for m2m to non-tenant model