Redesigned Events and Pubsub