Infra: Additional changes