Better handling of event observing