Add cluster/state to commands