Add support for JSON IDs