#1 - Update model structure