Added basic event management and data storage