Added generic event table