TranslatableMapBuilder refactoring
Dependencies update