Added client layer; fixed responses