Refactored privacy