refactored clld api