Improve json format, but dont done totality