Added fromJSON