New universal entity handling.