Use Model objects instead of OpenStruct for scenarios