Added ability to specify options in YAML