Add Object constructor
Fix fromJSON