ETResponse refactor