Improved the js-model.