Improvements to Data to support dependency