Improved event adding