Added support for Buyer/Seller