updated entities to use uuid's