Add more Window events