Refactoring and Default strategy bug fix