updated dependencies
Changed dependencies. Refactored Factory