Add strategy and correct api