More containers and factories added