Adding proper sanitization