Refactored Merchants