Refactored events for simplicity