MessageSource refactor, doxx