Added ENTER key support