Moved Commands to CommandListeners