Implement Splitter upgrade

Close #2