Added more models, to support the new design of the system