Updated java classes