Changed Java-Client