0001138: Use TypeId in Draft & Arch