Add more events with debug logging for testing