Added new model, renamed things