Refactor, added Strategy to Director