Update: started support for UUID