Refactoring: Adapting KeyedList