Added JSON compatibility