First merge between old version and Vertx archetype