Overhaul of model structure