Added support for i18n and messages from properties file