Updated strategy to work with new market event based impl