Added UUID support to serializer