Updated cluster master with data generation support