Support new java util