Updated API, and uses new cls version