Fixed entity annotations