updated packages, reintroduced EntityBase