Adding entity classes