Added i18n and some other features