Further changes made to the java class