few more changes for java data sync