Continuing with the flatten XML changes