Refactored Strategy in proper model location