Modified stuff to be consistent with refactored dependency parses