Added more support for the sanitization process