Further changes for javascript