diff --git a/build.gradle b/build.gradle
index b72964d..115ae3d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,6 @@ plugins {
     id "de.undercouch.download" version "4.1.2"
     id "de.marcphilipp.nexus-publish" version "0.4.0"
     id 'io.codearte.nexus-staging' version '0.30.0'
-    id "com.jfrog.bintray" version "1.8.4"
 }
 
 description 'Web3j command line tools'
diff --git a/src/main/java/org/web3j/console/wrapper/subcommand/SolidityGenerateCommand.java b/src/main/java/org/web3j/console/wrapper/subcommand/SolidityGenerateCommand.java
index f09b238..b434653 100644
--- a/src/main/java/org/web3j/console/wrapper/subcommand/SolidityGenerateCommand.java
+++ b/src/main/java/org/web3j/console/wrapper/subcommand/SolidityGenerateCommand.java
@@ -14,6 +14,7 @@
 
 import java.io.File;
 
+import org.web3j.tx.Contract;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
 
@@ -94,6 +95,11 @@ public class SolidityGenerateCommand implements Runnable {
             description = "Use Java primitive types.")
     private boolean primitiveTypes = false;
 
+    @Option(
+            names = {"-B", "--generateBoth"},
+            description = "Generate both send_ and call_ functions.")
+    private boolean generateBoth = false;
+
     @Override
     public void run() {
         try {
@@ -111,7 +117,10 @@ public void run() {
                             packageName,
                             useJavaTypes,
                             primitiveTypes,
-                            addressLength)
+                            generateBoth,
+                            Contract.class,
+                            addressLength,
+                            false)
                     .generate();
         } catch (Exception e) {
             exitError(e);