More general Refactoring and Preparation for MessageFormats