Make the splitter more generic