Added dependency on UUID