Fixed up samples structure