chosen support

requires PR in MM