add the framework to the model
some renaming