Improve json_return and move it to future