Update sample builder to nest sample lists