Fixing the models to form proper hirearchy