Future changes for java sdk