Refactor Problem JSON to contain a "messages" field like in the good old days