Refactor from scenario builder
Added midokura scenario manager draft