Using entities based on Raymond's feedback.