Re-ordering of model definition