Consolidate the event table usage