Add more appropriate event calls