New Infrastructure factory. Refactoring.