Add management of responses