Added event in baseclass