Follow the change that uses OpenStruct