Start to refactor Strategy objects