Fixed bugs related to Data Generator. Fixed cyclic inclusion of setup group