Replaced harcoded UUids with UUids.StartOf