- Changed custom entity selectors from event based to factory based.