Moving two scenarios to "basic" feature