Don't convert UUID to string till needed
Add support for longs and doubles