Refactor privacy provider