Added support for choice