Adding KLL define support