Upgrade IDs to length 16