Added JS-less support