Using event wrapper for less copy/paste code