expert: added collections, i18n, factories