Added proper filesplitter, added dictionary support