Add basic events handling