Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/TranslationDao.java
===================================================================
--- eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/TranslationDao.java	(revision 1d074d92e4f5d8c32ce2e805597de83385087291)
+++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/TranslationDao.java	(revision 1d074d92e4f5d8c32ce2e805597de83385087291)
@@ -0,0 +1,7 @@
+package info.ajanovski.eprms.tap.data;
+
+public interface TranslationDao {
+
+	public String getTranslation(String className, String AttributeCode, long originalObjectId, String locale);
+
+}
Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/TranslationDaoImpl.java
===================================================================
--- eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/TranslationDaoImpl.java	(revision 1d074d92e4f5d8c32ce2e805597de83385087291)
+++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/TranslationDaoImpl.java	(revision 1d074d92e4f5d8c32ce2e805597de83385087291)
@@ -0,0 +1,38 @@
+package info.ajanovski.eprms.tap.data;
+
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.hibernate.Session;
+
+import info.ajanovski.eprms.model.entities.Translation;
+
+public class TranslationDaoImpl implements TranslationDao {
+
+	@Inject
+	private Session session;
+
+	@Inject
+	private GenericDao genericDao;
+
+	private Session getEntityManager() {
+		return session.getSession();
+	}
+
+	@Override
+	public String getTranslation(String className, String attributeCode, long originalObjectId, String locale) {
+		try {
+			Translation t = (Translation) getEntityManager().createQuery("""
+					from Translation
+					where className=:className and
+					      attributeCode=:attributeCode and
+					      originalObjectId=:originalObjectId and
+					      locale=:locale
+					""").setParameter("className", className).setParameter("attributeCode", attributeCode)
+					.setParameter("originalObjectId", originalObjectId).setParameter("locale", locale)
+					.getSingleResult();
+			return t.getTranslatedText();
+		} catch (Exception e) {
+			return null;
+		}
+	}
+
+}
Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/AppModule.java
===================================================================
--- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/AppModule.java	(revision 67767a0026b9ba5cf8925fd1aaaf85410a41064a)
+++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/AppModule.java	(revision 1d074d92e4f5d8c32ce2e805597de83385087291)
@@ -32,6 +32,9 @@
 import org.apache.tapestry5.commons.MappedConfiguration;
 import org.apache.tapestry5.commons.OrderedConfiguration;
+import org.apache.tapestry5.hibernate.HibernateConstants;
 import org.apache.tapestry5.hibernate.HibernateEntityPackageManager;
+import org.apache.tapestry5.hibernate.HibernateSymbols;
 import org.apache.tapestry5.hibernate.HibernateTransactionAdvisor;
+import org.apache.tapestry5.hibernate.web.HibernatePersistenceConstants;
 import org.apache.tapestry5.http.services.RequestGlobals;
 import org.apache.tapestry5.ioc.MethodAdviceReceiver;
@@ -60,4 +63,5 @@
 import info.ajanovski.eprms.tap.data.ProjectDao;
 import info.ajanovski.eprms.tap.data.ResourceDao;
+import info.ajanovski.eprms.tap.data.TranslationDao;
 import info.ajanovski.eprms.tap.util.AppConfig;
 import info.ajanovski.eprms.tap.util.UserInfo;
@@ -78,4 +82,5 @@
 		binder.bind(ResourceDao.class);
 		binder.bind(MessagingService.class);
+		binder.bind(TranslationDao.class);
 		binder.bind(TranslationService.class);
 		binder.bind(SystemConfigService.class);
@@ -88,5 +93,5 @@
 
 	public static void contributeApplicationDefaults(MappedConfiguration<String, Object> configuration) {
-		configuration.add(SymbolConstants.SUPPORTED_LOCALES, "en,mk");
+		configuration.add(SymbolConstants.SUPPORTED_LOCALES, "mk,en");
 		configuration.add(SymbolConstants.HMAC_PASSPHRASE,
 				AppConfig.getString("tapestry.hmac-passphrase") + UUID.randomUUID());
@@ -95,5 +100,5 @@
 		configuration.add(SymbolConstants.CHARSET, "UTF-8");
 
-		configuration.add("tapestry.hibernate.early-startup", true);
+		configuration.add(HibernateSymbols.EARLY_START_UP, true);
 
 		configuration.add(SymbolConstants.JAVASCRIPT_INFRASTRUCTURE_PROVIDER, "jquery");
Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/TranslationServiceImpl.java
===================================================================
--- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/TranslationServiceImpl.java	(revision 67767a0026b9ba5cf8925fd1aaaf85410a41064a)
+++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/TranslationServiceImpl.java	(revision 1d074d92e4f5d8c32ce2e805597de83385087291)
@@ -1,41 +1,16 @@
 package info.ajanovski.eprms.tap.services;
 
-import java.util.List;
+import org.apache.tapestry5.ioc.annotations.Inject;
 
-import org.apache.tapestry5.ioc.annotations.Inject;
-import org.hibernate.Criteria;
-import org.hibernate.Session;
-import org.hibernate.criterion.Restrictions;
-
-import info.ajanovski.eprms.model.entities.Translation;
+import info.ajanovski.eprms.tap.data.TranslationDao;
 
 public class TranslationServiceImpl implements TranslationService {
 
 	@Inject
-	private Session session;
-
-	@Inject
-	private GenericService genericService;
-
-	private Session getEntityManager() {
-		return session.getSession();
-	}
+	private TranslationDao translationDao;
 
 	@Override
 	public String getTranslation(String className, String attributeCode, long originalObjectId, String locale) {
-		try {
-			Translation t = (Translation) getEntityManager().createQuery("""
-					from Translation
-					where className=:className and
-					      attributeCode=:attributeCode and
-					      originalObjectId=:originalObjectId and
-					      locale=:locale
-					""").setParameter("className", className).setParameter("attributeCode", attributeCode)
-					.setParameter("originalObjectId", originalObjectId).setParameter("locale", locale)
-					.getSingleResult();
-			return t.getTranslatedText();
-		} catch (Exception e) {
-			return null;
-		}
+		return translationDao.getTranslation(className, attributeCode, originalObjectId, locale);
 	}