Updated Entity Base