Update API and imporve json response