Add possiblity to index uuids