Made some stuff UUID compatible