Added Splitter and Handler