Modify policy/api to use RestServer from common