Makes models not polymorphic, adds bodys