Added proper infrastructure factory configuration