Updated Model Generator to have high flexibility for the tester