Added keyboard handler to AddEvent also