Add cleaner WBS code handling