Updated CommandListener.java