Added some core entities that we expect to use