Added data sanitization