Implemented entity correction