Added UUID support.