Add notes for old samples
Adapt sample loading to new world