Added more types for Entity or Paramerter.