Fixed class responses to be more usable