JS-specific changes