Add support for more options