Add some events handling