Add support for "include_extras" and "scale" options
Fix creating a scenario without a scaling