add support for option list