updated framewor with last modification from ComplexGenerator