Added debug infra and command infra