Sync from xmltools
Be able to move some nodes