Nashorn modifications