Use proper entity