Added javascript support