Less generic 'options' and explicity add support for nesting