SplitListMap refactoring