Added command listener