Add cluster and supervisor