made the swift tenant and user two separate things