Reorganize XML ref for defaultFactory