Updated all Entity classes