Updated Data Entities