Updated key event to have all the valid parts