Added extra fields to JSON and fixed add.