[#11] Use new ID format