Removed dependency on event component.