Added Listeners and CommandExecutor.