Changed m2m, added foreign keys, and full name [MJ-677]