These don't need to be OpenStruct anymore...