Added basic and not tested support for m2m fields
Just a check point, not stable!