Adjusted user and group to new model.