Scsilist refactor