Add support for compound options