Added additional data sanitization