Add the Infra working version