FIX Adapted for STreaming optimized for the JVM