Add properties to default Created Event, Refactor