Port to JSR-269