Improved object orientation of events