Add a wait-cmd for external consumers