Added command event listeners