XML Configuration update

Change field order