Some Improvements for ChoiseMediator