Added ability to specify client and or avaliablity zone