Added more entities