Added additional checks for privacy