Many changes for working with Javascript