Added several new classes, updated Sanitization.