Added UUID support