Added Event manager feature