* improved entity handling