Re-added UUID support.

Im such a goofball