Add basic subdomain and individual merchant support