Changing to JDI response structure.