Adjusted packages and Java version