Enhanced data protection