Updated Entities and DB