Add support for multi-valued options