Updated model structure