Fixed handle error handling. Incorporated tracking UUID field in enumeration model