Added more java classes