Updated to reflect servier-side changes