Added command handler and listener on enter