Rewriting handler to match the current json structure.