Refactored / optimized / fixed privacy provider