Updated entity classes

Now complete