added client and location support