Added data generator mode