Refactored strategies