Add support for choose option