Refactor/adds integrity check for accessing uuid