Change response to include message, add public json