Improved fork of java-cli-api