*Improved Json class again!