Improve Choice Manager