changing the Data entity class so it has more structure