Added support for j&k