Adding CLAMS and Other Updates