Added some entities and views