Some changes for javascript