Models fully updated as they need to be for the prototype