Optimization of dataset edition and updating

Optimization of dataset edition and updating