Added sanitization functionallity