OpenStruct Improved