more changes to include uuid