added further entity classes