Improve events templates