v7: Add support for bonus IDs.