Fixed handling of model data