updated entity classes