ListView model refactoring