Start of support for tracking selected options