Added sanitization