Added the correct domain checks in WF and reordered one.