Add more event and debug