Updated for events processing.