Added parameter sanitizer