Fixing datastructures on java version