Bug fix and added JsonField.