TranslatableMapBuilder refactoring