MM: new configurations (resource bundle) & some refactoring