#6 - Re-factoring of response class.