Updated jsonclass accordingly