Updates models to correctly have all associations