Added JSON Rest support