Some first entity classes added