Improve i18n support
Update project template