Adds CLM support and improves documentation