Added Enter Submit support