Minor changes on creating event