Updated splitter to support java collections