Commandlistener and Util updates