improve entity section