Moved one more method into EventsFactory