Detailing better my infrastructure