Added some entity classes