Use id instead of uuid