Added generalization
DOT generator fixes