Added some entity classes
Merge origin/master