refactored Data class for Builder design pattern