diff --git a/.classpath b/.classpath
index 2eec862..e54bb54 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/share-updates-2.6.2-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/share-updates-2.6.3-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/share-updates-2.6.2-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/share-updates-2.6.3-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -30,7 +30,6 @@
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
@@ -38,5 +37,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/share-updates-2.6.2-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/share-updates-2.6.3-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java b/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java
index 4e04491..b262cec 100644
--- a/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java
@@ -56,8 +56,8 @@ import org.gcube.portlets.user.shareupdates.shared.UploadedFile;
 import org.gcube.portlets.user.shareupdates.shared.UserSettings;
 import org.gcube.portlets.widgets.pickitem.shared.ItemBean;
 import org.gcube.social_networking.socialutillibrary.Utils;
-import org.gcube.socialnetworking.token.MessageParser;
-import org.gcube.socialnetworking.token.URLToken;
+import org.gcube.socialnetworking.socialtoken.SocialMessageParser;
+import org.gcube.socialnetworking.socialtoken.URLToken;
 import org.gcube.vomanagement.usermanagement.GroupManager;
 import org.gcube.vomanagement.usermanagement.RoleManager;
 import org.gcube.vomanagement.usermanagement.UserManager;
@@ -149,7 +149,7 @@ public class ShareUpdateServiceImpl extends RemoteServiceServlet implements	Shar
 		if (mentionedItems != null && ! mentionedItems.isEmpty()) {
 			mentionedUsers = getMentionsBean(mentionedItems);
 		}
-		MessageParser messageParser = new MessageParser(postText);
+		SocialMessageParser messageParser = new SocialMessageParser(postText);
 		String siteLandingPagePath = PortalContext.getConfiguration().getSiteLandingPagePath(getThreadLocalRequest());
 		String escapedFeedText = messageParser.getParsedMessage(mentionedUsers, siteLandingPagePath);
 		List<String> hashtags = messageParser.getHashtags();
@@ -271,7 +271,7 @@ public class ShareUpdateServiceImpl extends RemoteServiceServlet implements	Shar
 		if (mentionedItems != null && ! mentionedItems.isEmpty()) {
 			mentionedUsers = getMentionsBean(mentionedItems);
 		}
-		MessageParser messageParser = new MessageParser(feedText);
+		SocialMessageParser messageParser = new SocialMessageParser(feedText);
 		String siteLandingPagePath = PortalContext.getConfiguration().getSiteLandingPagePath(getThreadLocalRequest());
 		String escapedFeedText = messageParser.getParsedMessage(mentionedUsers, siteLandingPagePath);
 		List<String> hashtags = messageParser.getHashtags();