Added JS support