WIP Bug 833011 - Provide more flexible way for dealing with events + existing objects