Added functionality to support i18n and db query class