Modify events methods