dw: added BranchType and BranchParent to conformed.DimBranch