Upgrade to SI Java DSL M2