Added client creation code