Added ability to add Infrastructure components