Minor changes to model structure