Changes to support deployd backend