Feature/kh dynamic