Refactor the Factory pattern to have more scalable solution.