Completed JSON

Structure should not differ from now on.