updated model structure