Extending Category Partition's Base Choice criterion to better support constraints. Issue 3 (10th April 2017)