Added more necessary entities