Reworked the data object public API