Added features to JSON generation.