Adding more event entry stuff