diff --git a/anno-gui/src/main/java/org/genesys2/anno/gui/SettingsDialog.java b/anno-gui/src/main/java/org/genesys2/anno/gui/SettingsDialog.java
index e8dc6a7df0e387b6f88b4786812a17ba539cd24a..2c82702b8abc3469a67e2a358f69e32c0f2cb08f 100644
--- a/anno-gui/src/main/java/org/genesys2/anno/gui/SettingsDialog.java
+++ b/anno-gui/src/main/java/org/genesys2/anno/gui/SettingsDialog.java
@@ -231,7 +231,7 @@ public class SettingsDialog extends Dialog {
 		try {
 			String res = genesysClient.me();
 			System.err.println("/me: " + res);
-			oauthSettings.setAccessToken(genesysClient.getAccessToken().getToken());
+			oauthSettings.setAccessToken(genesysClient.getTokens().getAccessToken());
 
 			SwtUtil.showMessageBox(getParent(), "OAuth", "Tokens are up to date.");
 
@@ -241,7 +241,7 @@ public class SettingsDialog extends Dialog {
 					+ oauthSettings.getServerUrl() + "\n\n" + e.getMessage());
 		} catch (OAuthAuthenticationException e) {
 			_log.warn(e.getMessage());
-			String authorizationUrl = genesysClient.getAuthorizationUrl(null);
+			String authorizationUrl = genesysClient.getAuthorizationUrl();
 			VerifierDialog vd = new VerifierDialog(getParent(), SWT.NONE);
 			String verifierCode = vd.open(authorizationUrl);
 
@@ -250,8 +250,8 @@ public class SettingsDialog extends Dialog {
 				_log.info("Got verifier code: " + verifierCode);
 				try {
 					genesysClient.authenticate(verifierCode);
-					oauthSettings.setAccessToken(genesysClient.getAccessToken().getToken());
-					oauthSettings.setRefreshToken(genesysClient.getRefreshToken().getToken());
+					oauthSettings.setAccessToken(genesysClient.getTokens().getAccessToken());
+					oauthSettings.setRefreshToken(genesysClient.getTokens().getRefreshToken());
 				} catch (Throwable e1) {
 					_log.error(e1.getMessage(), e1);
 					SwtUtil.showMessageBox(getParent(), "OAuth error", e1.getMessage());
diff --git a/anno-gui/src/main/java/org/genesys2/anno/gui/SheetDisplay.java b/anno-gui/src/main/java/org/genesys2/anno/gui/SheetDisplay.java
index 5e4812f476335559a5ba0c06fabc36e2aa773475..872ad560f74710b8398c942f605db522ebd0af82 100644
--- a/anno-gui/src/main/java/org/genesys2/anno/gui/SheetDisplay.java
+++ b/anno-gui/src/main/java/org/genesys2/anno/gui/SheetDisplay.java
@@ -102,7 +102,8 @@ public class SheetDisplay extends Composite {
 	@Autowired
 	private ColumnDefs columnDefs;
 
-	private static final ObjectMapper mapper = new ObjectMapper();
+	@Autowired
+	private ObjectMapper mapper;
 
 	private static class ContentProvider implements IStructuredContentProvider {
 		@Override
diff --git a/anno-gui/src/main/java/org/genesys2/anno/gui/SpringConfig.java b/anno-gui/src/main/java/org/genesys2/anno/gui/SpringConfig.java
index f057a1a8a5f46ff8956ba5de2e739e3c3e39ef6b..bb6bfc5a17bbd2619c363c2ae201be6e12475b26 100644
--- a/anno-gui/src/main/java/org/genesys2/anno/gui/SpringConfig.java
+++ b/anno-gui/src/main/java/org/genesys2/anno/gui/SpringConfig.java
@@ -18,6 +18,7 @@ import org.genesys2.anno.parser.XlsxDataSourceParser;
 import org.genesys2.anno.reader.JDBCRowReader;
 import org.genesys2.anno.util.ConnectionUtils;
 import org.genesys2.client.oauth.GenesysClient;
+import org.genesys2.client.oauth.GenesysTokens;
 import org.genesys2.client.oauth.api.GenesysApi;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -30,6 +31,8 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 /**
  * Main Spring configuration
  * 
@@ -51,10 +54,10 @@ public class SpringConfig {
 		return dataSourceLoader;
 	}
 
-    @Bean
-    public JdbcDrivers jdbcDrivers() {
-        return new JdbcDrivers();
-    }
+	@Bean
+	public JdbcDrivers jdbcDrivers() {
+		return new JdbcDrivers();
+	}
 
 	@Bean
 	public ExecutorService getExecutorService() {
@@ -91,8 +94,9 @@ public class SpringConfig {
 
 	@Bean
 	@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-	public SheetDisplay sheetDisplay(IDataSource dataSource,IDataSourceSheet dataSourceSheet, Composite parent, TreeViewer treeViewer, int style) {
-		return new SheetDisplay(dataSource,dataSourceSheet, parent, treeViewer, style);
+	public SheetDisplay sheetDisplay(IDataSource dataSource, IDataSourceSheet dataSourceSheet, Composite parent,
+			TreeViewer treeViewer, int style) {
+		return new SheetDisplay(dataSource, dataSourceSheet, parent, treeViewer, style);
 	}
 
 	@Bean
@@ -152,13 +156,19 @@ public class SpringConfig {
 		return extraClassLoader;
 	}
 
+	@Bean
+	public ObjectMapper objectMapper() {
+		return new ObjectMapper();
+	}
+
 	@Bean
 	public static PropertyPlaceholderConfigurer propertyPlaceholderConfigurer() {
 		final PropertyPlaceholderConfigurer propertyPlaceholderConfigurer = new PropertyPlaceholderConfigurer();
 		// Need to ignore "genesys.properties" if not found
 		propertyPlaceholderConfigurer.setIgnoreResourceNotFound(true);
 
-		propertyPlaceholderConfigurer.setLocations(new Resource[] { new ClassPathResource("genesys.properties"), new ClassPathResource("local.properties") });
+		propertyPlaceholderConfigurer.setLocations(new Resource[] { new ClassPathResource("genesys.properties"),
+				new ClassPathResource("local.properties") });
 
 		return propertyPlaceholderConfigurer;
 	}
@@ -168,8 +178,10 @@ public class SpringConfig {
 		GenesysClient genesysClient = new GenesysClient();
 		genesysClient.setGenesysApi(new GenesysApi());
 		genesysClient.setBaseUrl(oauthSettings.getServerUrl());
-		genesysClient.setAccessToken(oauthSettings.getAccessToken());
-		genesysClient.setRefreshToken(oauthSettings.getRefreshToken());
+		GenesysTokens genesysTokens = new GenesysTokens();
+		genesysTokens.setAccessToken(oauthSettings.getAccessToken());
+		genesysTokens.setRefreshToken(oauthSettings.getRefreshToken());
+		genesysClient.setTokens(genesysTokens);
 		genesysClient.connect(oauthSettings.getClientKey(), oauthSettings.getClientSecret(), "oob");
 		return genesysClient;
 	}