Improved event-system