JC: Added more models to the system.