Add support for choice paramters.