Fixed list command and the sample components
Fixed list command and the sample components