Conversion to use entity event