[#2] - Improve response