Fixed entities annotation comments