Support longer IDs