Added Key sanitization