Improve Event Package