Improve sample json