Moved EventSinkHub
removed unnecessary parameter
Improved ComponentFactory