Fix json loading
Fix fromJSON method