Added Partitioner and Parser