Added javascript and php support