Adding additional entity classes