Refactoring data module to use DataObjects.