Added Event handling