Use TypeId in Draft