Refactored how the lists working internally.