Choice settings

Support for choice settings…