Added JSON generator