Added UUID support to data streams