Updated some java classes