DS localization preliminary refactoring fulfilled