Added JSON entry support