Updates to old boundary code mapping