List refactored