Remove dependcy on uuid