Updating entity classes to include children...