Changed Camera and vendor entity classes