Added additional entity classes