Fixing stock component maintenance to handle the flattened XML.