Added stuff for java