Added container detection and building