--Some refactoring to Response.java