Improved Data namespace