Rewriting class Data, adding Model