DDF-482 removed hardcoded role check and added policy manager