Improve scripts: call Java directly