Updated sample list creation