Renaming and implementing new model