Add basic changes according to new model