Refactoring strategy and adding some details