Refactor Merchant/Bank to Entity