Added Event System Architecture