Replaced OpenStruct with Struct