Add support for JSON IDs
Add support for JSON IDs