Massive update to model structure