Now using the same json structure as the one used by hub.