Added disable and enable functionality to choice module