Proper import from Java version