Added proper nashhorn manegement