Added conditional compilation for data generator stage of development