Banks Setup in R12

We make payments using Citibank New York – sometimes we make cross border payments via SWIFT using the Swift Code for that branch of CITIUS33.  Sometimes we make Fedwire payments using the ABA Code of 021000089.  Am I to assume that although both of these codes directly relate to the one branch of Citibank (Citi New York) that we will be treating these as two separate branches in R12 Cash Management and will indeed need to set up two separate bank branches based on the payment method (SWIFT/Fedwire) and associated code (Swift Code/ABA Code)?