[Event] Improved the package