Changed from java to gsi data