Improve responses