Refined and tested Data Object