DDF-351 updated for admin api changes