Data manager final touches

Robustness and performance improvements